From 038714d4ee4782fe401f008826661fab9e50ba80 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 12 Oct 2018 17:26:46 +0000 Subject: [PATCH] dbian/rules: Install shim separately Signed-off-by: Ian Jackson --- debian/rules | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index b91a59560b..e0d8355c39 100755 --- a/debian/rules +++ b/debian/rules @@ -207,10 +207,19 @@ override_dh_auto_build: # We keep the amount of fixup and messing about with debian/tmp/ # to a minimum, because when working it is easier to rerun the # later parts of the build than the whole of the two upstream make installs. -# However, there are two sets of fixes we must make: +# However, there are three sets of fixes we must make: override_dh_auto_install: $(TEMPLATED_FILES) $(MAKE) $(make_args_xen) DESTDIR=$t install-xen - $(MAKE) $(make_args_tools) DESTDIR=$t install-{tools,docs} + $(MAKE) $(make_args_tools) DESTDIR=$t \ + install-{tools,docs} CONFIG_PV_SHIM=n + : + @# shim install target needs to be run separately because we + @# need to pass it the make_args_xen settings, in particular + @# on i386 bwe need to pass x86_64 here to actually build it. + @# Luckily this target, unlike the build, is a noop on + @# shimless arches, so it does not need to be conditional. + $(MAKE) $(make_args_xen) DESTDIR=$t $(make_args_xen) \ + -C tools/firmware install-shim : @# pkgconfig files contain arch-specific paths so must @# be in /usr/lib/, not /usr/share. -- 2.30.2